cargo.git
9 years agoAdd ConfigFile struct to handle config file paths.
Juan Hernández [Thu, 8 Sep 2016 20:20:36 +0000 (16:20 -0400)]
Add ConfigFile struct to handle config file paths.

9 years agoDon't parse the config in home if it was parsed already.
Juan Hernández [Thu, 8 Sep 2016 19:58:53 +0000 (15:58 -0400)]
Don't parse the config in home if it was parsed already.

This is the first version of the fix. It needs clean up.

9 years agoAdd a test that reproduces the error of parsing home config twice.
Juan Hernández [Thu, 8 Sep 2016 19:13:31 +0000 (15:13 -0400)]
Add a test that reproduces the error of parsing home config twice.

9 years agoAuto merge of #3064 - dtolnay:rustc-macro, r=alexcrichton
bors [Tue, 6 Sep 2016 17:46:41 +0000 (10:46 -0700)]
Auto merge of #3064 - dtolnay:rustc-macro, r=alexcrichton

Macros 1.1

Tested with https://github.com/serde-rs/serde/pull/530. This should be able to merge independently of https://github.com/rust-lang/rust/pull/35957.

r? @alexcrichton

9 years agoBump rustcversion to pick up rustc-macro support
David Tolnay [Tue, 6 Sep 2016 17:34:35 +0000 (10:34 -0700)]
Bump rustcversion to pick up rustc-macro support

9 years agoAuto merge of #3073 - pnkfelix:clarify-lib.name-in-Cargo.toml, r=alexcrichton
bors [Tue, 6 Sep 2016 05:52:29 +0000 (22:52 -0700)]
Auto merge of #3073 - pnkfelix:clarify-lib.name-in-Cargo.toml, r=alexcrichton

doc fix: clarify lib.name property

doc fix: clarify lib.name property

`extern crate` uses `lib.name`; default is post '-' => '_' substitution.

9 years agoAuto merge of #3071 - japaric:moar-cargo, r=alexcrichton
bors [Tue, 6 Sep 2016 04:48:16 +0000 (21:48 -0700)]
Auto merge of #3071 - japaric:moar-cargo, r=alexcrichton

prepare for cargo for mips and powerpc

with these changes I can cross compile Cargo for these targets:

- mips-unknown-linux-gnu
- mipsel-unknown-linux-gnu
- powerpc-unknown-linux-gnu
- powerpc64-unknown-linux-gnu
- powerpc64el-unknown-linux-gnu

using these commands:

```
$ ./.travis.install.deps.sh
$ ./configure --local-rust-root=$(pwd)/rustc --enable-nightly --target=$TARGET
$ make
```

in Ubuntu 16.04 using the standard cross toolchains

r? @alexcrichton
cross compiling Cargo for the mips targets requires rust-lang/libc#378

9 years agodocfix: `extern crate` uses `lib.name`; default is post '-' => '_' substitution
Felix S. Klock II [Mon, 5 Sep 2016 12:22:30 +0000 (14:22 +0200)]
docfix: `extern crate` uses `lib.name`; default is post '-' => '_' substitution

9 years agoAuto merge of #3072 - pietroalbini:fix-faq, r=steveklabnik
bors [Sun, 4 Sep 2016 20:31:38 +0000 (13:31 -0700)]
Auto merge of #3072 - pietroalbini:fix-faq, r=steveklabnik

Remove reference of Rust 1.11.0 release date in the FAQ

In the `--frozen` section of the FAQ, there is a reference to the Rust 1.11.0 release date (probably because it was added in June), which is now in the past. In this pull request I removed that reference, since it's not useful anymore.

I also reflowed the text to 80 chars, to be consistent with the rest of the document :)

9 years agoRemove reference of Rust 1.11.0 release date in the FAQ
Pietro Albini [Sun, 4 Sep 2016 19:56:05 +0000 (21:56 +0200)]
Remove reference of Rust 1.11.0 release date in the FAQ

This commit also reflows the text after removing the reference.

9 years agoEmpty commit to trigger Travis build of rustc-macro
David Tolnay [Sun, 4 Sep 2016 15:25:30 +0000 (08:25 -0700)]
Empty commit to trigger Travis build of rustc-macro

9 years agoprepare for cargo for mips and powerpc
Jorge Aparicio [Sun, 4 Sep 2016 00:45:18 +0000 (19:45 -0500)]
prepare for cargo for mips and powerpc

with these changes I can cross compile Cargo for these targets:

- mips-unknown-linux-gnu
- mipsel-unknown-linux-gnu
- powerpc-unknown-linux-gnu
- powerpc64-unknown-linux-gnu
- powerpc64el-unknown-linux-gnu

using these commands:

```
$ ./.travis.install.deps.sh
$ ./configure --local-rust-root=$(pwd)/rustc --enable-nightly --target=$TARGET
$ make
```

in Ubuntu 16.04 using the standard cross toolchains

9 years agoAuto merge of #3068 - binarybirchtree:generalize-error-message, r=alexcrichton
bors [Sat, 3 Sep 2016 17:29:20 +0000 (10:29 -0700)]
Auto merge of #3068 - binarybirchtree:generalize-error-message, r=alexcrichton

Generalize error message used by both `cargo package` and `cargo publish`.

Resolves issue #3061.

This pull request updates the wording of the error message in question to be applicable to both `cargo package` and `cargo publish`, and adds a test case for the example in the issue description.

9 years agoGeneralize error message used by both `cargo package` and `cargo publish`.
Binary Birch Tree [Sat, 3 Sep 2016 01:05:26 +0000 (21:05 -0400)]
Generalize error message used by both `cargo package` and `cargo publish`.

9 years agoExplicitly bind Some(false)
David Tolnay [Thu, 1 Sep 2016 21:17:42 +0000 (14:17 -0700)]
Explicitly bind Some(false)

9 years agoAuto merge of #3060 - rillian:package_path_deps, r=alexcrichton
bors [Thu, 1 Sep 2016 19:51:44 +0000 (12:51 -0700)]
Auto merge of #3060 - rillian:package_path_deps, r=alexcrichton

Reject path-based dependencies in `cargo package`

`cargo publish` will complain if a package manifest contains a path, rather than registry+version-based dependency. Make `cargo package` do the same so that issue is caught sooner in developer workflow.

9 years agoAuto merge of #3063 - Wilfred:patch-1, r=alexcrichton
bors [Thu, 1 Sep 2016 18:49:31 +0000 (11:49 -0700)]
Auto merge of #3063 - Wilfred:patch-1, r=alexcrichton

Clarify wording: this restriction is not just libraries

I found the previous wording a little confusing (see [discussion on users.rust-lang.org](https://users.rust-lang.org/t/uploading-binary-packages-not-libraries-to-crates-io/7072)).

Since the section heading specifically refers to libraries, I was puzzled that crates.io rejected my binary package with wildcard dependencies (plus a Cargo.lock file). I think this wording is clearer, let me know what you think.

Ideally we'd also say the reasoning behind rejecting wildcard dependencies for binary crates, but I don't know what the reasoning is.

9 years agoTest a crate that is both a plugin and a proc macro
David Tolnay [Thu, 1 Sep 2016 17:42:23 +0000 (10:42 -0700)]
Test a crate that is both a plugin and a proc macro

9 years agoTest for rustc-macro
David Tolnay [Thu, 1 Sep 2016 17:29:24 +0000 (10:29 -0700)]
Test for rustc-macro

9 years agoAuto merge of #3065 - mbrock:master, r=alexcrichton
bors [Thu, 1 Sep 2016 17:12:15 +0000 (10:12 -0700)]
Auto merge of #3065 - mbrock:master, r=alexcrichton

doc: mention feature toggling in "Specifying deps"

Basically copies info that was already on another page.

9 years agodoc: mention feature toggling in "Specifying deps"
Mikael Brockman [Thu, 1 Sep 2016 15:53:45 +0000 (18:53 +0300)]
doc: mention feature toggling in "Specifying deps"

9 years agoLinewrap the error message from check_metadata.
Ralph Giles [Thu, 1 Sep 2016 00:04:29 +0000 (17:04 -0700)]
Linewrap the error message from check_metadata.

This lets test result expected output pass the long-line style check.

9 years agoMacros 1.1
David Tolnay [Thu, 1 Sep 2016 04:01:36 +0000 (21:01 -0700)]
Macros 1.1

9 years agoClarify wording: this restriction is not just libraries
Wilfred Hughes [Thu, 1 Sep 2016 03:25:07 +0000 (23:25 -0400)]
Clarify wording: this restriction is not just libraries

9 years agoVerify `cargo package` rejects path dependencies.
Ralph Giles [Wed, 31 Aug 2016 23:13:26 +0000 (16:13 -0700)]
Verify `cargo package` rejects path dependencies.

Port of the equivalent test from the `cargo publish` command.

9 years agoCheck for path dependencies.
Ralph Giles [Wed, 31 Aug 2016 23:11:33 +0000 (16:11 -0700)]
Check for path dependencies.

Port registry::verify_dependencies to the `cargo package`
command to perform the local portion of that check. It
looks like the package operation doesn't generally make
reference to the registry, so skip variant-origin checks
until publish time.

9 years agoAuto merge of #3038 - esclear:master, r=alexcrichton
bors [Wed, 31 Aug 2016 18:34:48 +0000 (11:34 -0700)]
Auto merge of #3038 - esclear:master, r=alexcrichton

Add --all-features flag to cargo

As (more or less) requested in #1173 I added a `--all-features` flag to cargo that builds all available features.

I hope I documented it in all the right places.

If there's something weird or wrong, please give me a heads up.

9 years agoAdd --all-features flag to cargo
Daniel Albert [Wed, 31 Aug 2016 17:03:26 +0000 (19:03 +0200)]
Add --all-features flag to cargo

9 years agoMerge pull request #3055 from rust-lang/revert-3054-simplify
Alex Crichton [Mon, 29 Aug 2016 16:30:37 +0000 (09:30 -0700)]
Merge pull request #3055 from rust-lang/revert-3054-simplify

Revert "Replace for loop with iterators"

9 years agoRevert "Replace for loop with iterators"
Alex Crichton [Mon, 29 Aug 2016 16:30:14 +0000 (09:30 -0700)]
Revert "Replace for loop with iterators"

9 years agoMerge pull request #3054 from matklad/simplify
Alex Crichton [Mon, 29 Aug 2016 16:29:58 +0000 (09:29 -0700)]
Merge pull request #3054 from matklad/simplify

Replace for loop with iterators

9 years agoReplace for loop with iterators
Aleksey Kladov [Mon, 29 Aug 2016 07:34:32 +0000 (10:34 +0300)]
Replace for loop with iterators

9 years agoAuto merge of #3050 - nbaksalyar:configure-fix, r=alexcrichton
bors [Sun, 28 Aug 2016 19:02:39 +0000 (12:02 -0700)]
Auto merge of #3050 - nbaksalyar:configure-fix, r=alexcrichton

Fix POSIX shell in configure script (support Illumos & Solaris)

This patch provides the same fix that is applied for the `configure` script in rustc:
https://github.com/rust-lang/rust/blob/master/configure#L3-L9. It is required because `#!/bin/sh` is not Bash/POSIX-compatible on Solaris and its derivatives by default.

This change was previously discussed there: https://github.com/rust-lang/rust/pull/28589.

9 years agoAuto merge of #3051 - matklad:ws-metadata, r=alexcrichton
bors [Sun, 28 Aug 2016 18:01:30 +0000 (11:01 -0700)]
Auto merge of #3051 - matklad:ws-metadata, r=alexcrichton

`cargo metadata` works with workspaces

Closes #3003

9 years ago`cargo metadata` works with workspaces
Aleksey Kladov [Sun, 28 Aug 2016 12:10:27 +0000 (15:10 +0300)]
`cargo metadata` works with workspaces

9 years agoFix POSIX shell in the configure script
Nikita Baksalyar [Thu, 16 Jun 2016 05:25:18 +0000 (05:25 +0000)]
Fix POSIX shell in the configure script

9 years agoAuto merge of #3047 - alexcrichton:update-libz, r=alexcrichton
bors [Fri, 26 Aug 2016 21:43:13 +0000 (14:43 -0700)]
Auto merge of #3047 - alexcrichton:update-libz, r=alexcrichton

Update libz-sys to 1.0.6

Fixes a build error on OSX

Closes #3037

9 years agoUpdate libz-sys to 1.0.6
Alex Crichton [Fri, 26 Aug 2016 21:42:40 +0000 (14:42 -0700)]
Update libz-sys to 1.0.6

Fixes a build error on OSX

Closes #3037

9 years agoAuto merge of #3040 - matklad:rootless-readlockfile, r=alexcrichton
bors [Fri, 26 Aug 2016 19:48:17 +0000 (12:48 -0700)]
Auto merge of #3040 - matklad:rootless-readlockfile, r=alexcrichton

Don't use current package when reading lockfile

Looks like this `default` thing is basically a hack, which is fired when the lockfile references some package which is no longer present. That is, if I remove `default` and just `unwrap` source id, the only test which fails is `git_with_lockfile` because it has a typo in the lockfile.

So I've just changed the `default` to some dummy path. Perhaps a more correct solution would be to ignore such packages completely when loading lockfile.

9 years agoAuto merge of #3044 - jeandudey:unused-code, r=alexcrichton
bors [Fri, 26 Aug 2016 15:56:44 +0000 (08:56 -0700)]
Auto merge of #3044 - jeandudey:unused-code, r=alexcrichton

Remove unused macro (configure_shell)

Also i've removed some unused lints on sha256.rs

9 years agoRemove unused macro (configure_shell)
Jean Pierre Dudey [Fri, 26 Aug 2016 12:01:07 +0000 (08:01 -0400)]
Remove unused macro (configure_shell)

Also i've removed some unused lints on sha256.rs

9 years agoRefactor EncodableResolve::into_resolve
Aleksey Kladov [Fri, 26 Aug 2016 09:34:17 +0000 (12:34 +0300)]
Refactor EncodableResolve::into_resolve

9 years agoAuto merge of #3039 - matklad:test-lockfiles, r=alexcrichton
bors [Thu, 25 Aug 2016 17:44:25 +0000 (10:44 -0700)]
Auto merge of #3039 - matklad:test-lockfiles, r=alexcrichton

Simplify lockfile tests

Use project builder to create a file and an extension function to read it.

9 years agoSimplify lockfile tests
Aleksey Kladov [Thu, 25 Aug 2016 08:34:25 +0000 (11:34 +0300)]
Simplify lockfile tests

9 years agoDon't use current package when reading lockfile
Aleksey Kladov [Thu, 25 Aug 2016 10:10:45 +0000 (13:10 +0300)]
Don't use current package when reading lockfile

9 years agoAuto merge of #3021 - alexcrichton:test-release-panic-abort, r=brson
bors [Tue, 23 Aug 2016 22:02:37 +0000 (15:02 -0700)]
Auto merge of #3021 - alexcrichton:test-release-panic-abort, r=brson

Fix transitive doctests panic=abort

Ensure that when we compile doctested libraries or examples we use the same
panic mode as the rest of the tests, namely ignoring panic=abort b/c libtest
isn't compiled with panic=abort.

Closes #3017

9 years agoAuto merge of #3031 - matklad:lockfile-test, r=alexcrichton
bors [Tue, 23 Aug 2016 20:57:48 +0000 (13:57 -0700)]
Auto merge of #3031 - matklad:lockfile-test, r=alexcrichton

Lockfile test

9 years agoRegression test for lockfile format
Aleksey Kladov [Mon, 22 Aug 2016 23:59:31 +0000 (02:59 +0300)]
Regression test for lockfile format

9 years agoAuto merge of #3029 - matklad:workspace-overrides, r=alexcrichton
bors [Mon, 22 Aug 2016 16:07:04 +0000 (09:07 -0700)]
Auto merge of #3029 - matklad:workspace-overrides, r=alexcrichton

Don't special case root package for overrides

Hi! What is the expected behavior of path overrides and workspaces? There are some [tests] for this, but looks like they don't actually test the behavior: this commit removes special casing of the root package, but `override_self` still passes. I see two options:

1. Allow overriding of the workspace members as usual. This amounts to removing that `filter`

2. Ignore overriding of the workspace members.

In any case, I think it would be nice to add a test which overrides local package to some other package to make sure that test does not pass simply because the package and its override are in fact the same.

[tests]: https://github.com/rust-lang/cargo/blob/master/tests/path.rs#L599-L679

9 years agoDon't special case root package for overrides
Aleksey Kladov [Mon, 22 Aug 2016 12:07:18 +0000 (15:07 +0300)]
Don't special case root package for overrides

9 years agoAuto merge of #3026 - whitequark:patch-1, r=alexcrichton
bors [Sun, 21 Aug 2016 17:37:40 +0000 (10:37 -0700)]
Auto merge of #3026 - whitequark:patch-1, r=alexcrichton

doc: fix platform-specific definitions section

Right now the section seems to imply that using cfg(target_pointer_width = "32")
is an acceptable way to detect whether the crate should be built for x86.

9 years agoForward compatibility with rootless lockfiles
Aleksey Kladov [Sat, 20 Aug 2016 21:27:06 +0000 (00:27 +0300)]
Forward compatibility with rootless lockfiles

9 years agodoc: fix platform-specific definitions section
whitequark [Sat, 20 Aug 2016 17:41:37 +0000 (17:41 +0000)]
doc: fix platform-specific definitions section

Right now the section seems to imply that using cfg(target_pointer_width = "32")
is an acceptable way to detect whether the crate is built for x86.

9 years agoAuto merge of #3022 - alexcrichton:add-more-metadata, r=brson
bors [Fri, 19 Aug 2016 21:24:29 +0000 (14:24 -0700)]
Auto merge of #3022 - alexcrichton:add-more-metadata, r=brson

Add a temporary env var to enable hashes in filenames

For rustbuild we need the hashes to exist for all deps, even if they're path
deps, because we care about the actual file names. For example we don't want to
install /usr/lib/libstd.so!

This adds a "secret" environment variable, `__CARGO_DEFAULT_LIB_METADATA` which
re-enables the old behavior of just putting hashes in filenames.

Closes #3005

9 years agoAdd a temporary env var to enable hashes in filenames
Alex Crichton [Fri, 19 Aug 2016 20:36:32 +0000 (13:36 -0700)]
Add a temporary env var to enable hashes in filenames

For rustbuild we need the hashes to exist for all deps, even if they're path
deps, because we care about the actual file names. For example we don't want to
install /usr/lib/libstd.so!

This adds a "secret" environment variable, `__CARGO_DEFAULT_LIB_METADATA` which
re-enables the old behavior of just putting hashes in filenames.

Closes #3005

9 years agoAuto merge of #3020 - tshepang:rustfmt-cargo_doc, r=alexcrichton
bors [Fri, 19 Aug 2016 20:44:26 +0000 (13:44 -0700)]
Auto merge of #3020 - tshepang:rustfmt-cargo_doc, r=alexcrichton

rustfmt cargo_doc.rs

9 years agoFix transitive doctests panic=abort
Alex Crichton [Fri, 19 Aug 2016 20:25:13 +0000 (13:25 -0700)]
Fix transitive doctests panic=abort

Ensure that when we compile doctested libraries or examples we use the same
panic mode as the rest of the tests, namely ignoring panic=abort b/c libtest
isn't compiled with panic=abort.

Closes #3017

9 years agorustfmt cargo_doc.rs
Tshepang Lekhonkhobe [Fri, 19 Aug 2016 20:18:57 +0000 (22:18 +0200)]
rustfmt cargo_doc.rs

9 years agoAuto merge of #3019 - matklad:rootless-resolve_ws, r=alexcrichton
bors [Fri, 19 Aug 2016 19:02:25 +0000 (12:02 -0700)]
Auto merge of #3019 - matklad:rootless-resolve_ws, r=alexcrichton

Don't require current package in resolve_ws

9 years agoDon't require current package in resolve_ws
Aleksey Kladov [Fri, 19 Aug 2016 18:00:21 +0000 (21:00 +0300)]
Don't require current package in resolve_ws

9 years agoAuto merge of #3018 - Jake-Shadle:master, r=steveklabnik
bors [Fri, 19 Aug 2016 16:35:26 +0000 (09:35 -0700)]
Auto merge of #3018 - Jake-Shadle:master, r=steveklabnik

docs(manifest): Update crate-types with `cdylib`

Rust 1.11 now supports the `cdylib` crate-type, so added it to the list of options.

Also added a link to the [Linkage](https://doc.rust-lang.org/reference.html#linkage) section in the Rust Reference manual which explains what the different crate types actually mean in practice....though right now it actually doesn't explain what a `cdylib` is, specifically. ;)

9 years agodocs(manifest): Remove 1.11 reference
Jake Shadle [Fri, 19 Aug 2016 16:32:22 +0000 (18:32 +0200)]
docs(manifest): Remove 1.11 reference

9 years agodocs(manifest): Update crate-types with `cdylib`
Jake Shadle [Fri, 19 Aug 2016 16:21:43 +0000 (18:21 +0200)]
docs(manifest): Update crate-types with `cdylib`

Rust 1.11 now supports the `cdylib` crate-type, so added it to the
list of options. Also added a link to the
[Linkage](https://doc.rust-lang.org/reference.html#linkage) section
in the Rust Reference manual which explains what the different
crate types actually mean in practice....though right now it actually
doesn't explain what a `cdylib` is, specifically. ;)

9 years agoAuto merge of #3013 - matklad:rootless-resolve, r=alexcrichton
bors [Thu, 18 Aug 2016 19:54:46 +0000 (12:54 -0700)]
Auto merge of #3013 - matklad:rootless-resolve, r=alexcrichton

Rootless resolve

This should help to make more commands applicable to the whole workspace. Though there is apparently a ton of work to make `cargo metadata` work with workspaces.

This does not support rootless lockfiles. Will do this in a separate PR.

9 years agoRemove root field from Resolve.
Aleksey Kladov [Wed, 17 Aug 2016 22:01:19 +0000 (01:01 +0300)]
Remove root field from Resolve.

9 years agoDon't use Resolve.root when checking for cycles
Aleksey Kladov [Wed, 17 Aug 2016 20:31:29 +0000 (23:31 +0300)]
Don't use Resolve.root when checking for cycles

9 years agoDon't use Resolve.root in cargo metadata
Aleksey Kladov [Wed, 17 Aug 2016 23:34:20 +0000 (02:34 +0300)]
Don't use Resolve.root in cargo metadata

9 years agoAdd current_package to the Context
Aleksey Kladov [Wed, 17 Aug 2016 19:20:09 +0000 (22:20 +0300)]
Add current_package to the Context

9 years agoAuto merge of #3015 - tshepang:match-block-not-needed, r=alexcrichton
bors [Thu, 18 Aug 2016 15:47:35 +0000 (08:47 -0700)]
Auto merge of #3015 - tshepang:match-block-not-needed, r=alexcrichton

match block not needed

9 years agoAuto merge of #3007 - whitequark:opt-level-s, r=alexcrichton
bors [Thu, 18 Aug 2016 15:06:09 +0000 (08:06 -0700)]
Auto merge of #3007 - whitequark:opt-level-s, r=alexcrichton

Allow using opt-level="s"/"z" in profile overrides

Initially, I've considered making a dedicated `OptLevel` enum, but this appeared to bring no practical benefit, only boilerplate, so I've used a String instead, which is also in line with the `u32` that was there before, not even checked for being in range `0...3`.

9 years agoMerge branch 'master' into match-block-not-needed
Tshepang Lekhonkhobe [Thu, 18 Aug 2016 06:49:07 +0000 (08:49 +0200)]
Merge branch 'master' into match-block-not-needed

9 years agomatch block not needed
Tshepang Lekhonkhobe [Thu, 18 Aug 2016 06:46:42 +0000 (08:46 +0200)]
match block not needed

9 years agoAllow using opt-level="s"/"z" in profile overrides.
whitequark [Wed, 17 Aug 2016 07:35:57 +0000 (07:35 +0000)]
Allow using opt-level="s"/"z" in profile overrides.

Fixes #2655.

9 years agoAuto merge of #3010 - steveklabnik:gh3001, r=alexcrichton
bors [Wed, 17 Aug 2016 19:02:10 +0000 (12:02 -0700)]
Auto merge of #3010 - steveklabnik:gh3001, r=alexcrichton

Revert to previous semver version.

As it turns out, people were taking advantage of bugginess in semver, so
we can't do this upgrade yet.

Fixes #3001

9 years agoAuto merge of #3011 - alexcrichton:new-openssl, r=alexcrichton
bors [Wed, 17 Aug 2016 17:57:29 +0000 (10:57 -0700)]
Auto merge of #3011 - alexcrichton:new-openssl, r=alexcrichton

Change download source for OpenSSL

Apparently they now redirect openssl.org to www.openssl.org

9 years agoChange download source for OpenSSL
Alex Crichton [Wed, 17 Aug 2016 17:56:43 +0000 (10:56 -0700)]
Change download source for OpenSSL

Apparently they now redirect openssl.org to www.openssl.org

9 years agoRevert to previous semver version.
Steve Klabnik [Wed, 17 Aug 2016 14:10:10 +0000 (10:10 -0400)]
Revert to previous semver version.

As it turns out, people were taking advantage of bugginess in semver, so
we can't do this upgrade yet.

Fixes #3001

9 years agoAuto merge of #3002 - untitaker:trunchate-cargo-config, r=alexcrichton
bors [Tue, 16 Aug 2016 21:11:32 +0000 (14:11 -0700)]
Auto merge of #3002 - untitaker:trunchate-cargo-config, r=alexcrichton

Trunchate cargo config properly

None

9 years agoTrunchate cargo config properly
Markus Unterwaditzer [Tue, 16 Aug 2016 20:51:08 +0000 (22:51 +0200)]
Trunchate cargo config properly

9 years agoAuto merge of #2991 - matklad:deadlocks, r=alexcrichton
bors [Mon, 15 Aug 2016 21:13:39 +0000 (14:13 -0700)]
Auto merge of #2991 - matklad:deadlocks, r=alexcrichton

Deadlocks with git dependencies

Only a test for now to verify that it actually fails on Travis.

Hopefully will close #2987

9 years agoUse a single lock for all git repositories
Aleksey Kladov [Mon, 15 Aug 2016 10:48:40 +0000 (13:48 +0300)]
Use a single lock for all git repositories

9 years agoAuto merge of #2994 - krbullock:fix/document-vcs-hg-config, r=alexcrichton
bors [Mon, 15 Aug 2016 19:05:55 +0000 (12:05 -0700)]
Auto merge of #2994 - krbullock:fix/document-vcs-hg-config, r=alexcrichton

Document ability to configure `cargo-new.vcs = "hg"`

9 years agoDocument ability to configure `cargo-new.vcs = "hg"`
Kevin Bullock [Mon, 15 Aug 2016 18:36:49 +0000 (13:36 -0500)]
Document ability to configure `cargo-new.vcs = "hg"`

9 years agoAdd a test for #2987
Aleksey Kladov [Sun, 14 Aug 2016 23:04:07 +0000 (02:04 +0300)]
Add a test for #2987

9 years agoAuto merge of #2988 - lifthrasiir:doc-open-with-target, r=alexcrichton
bors [Sun, 14 Aug 2016 07:07:46 +0000 (00:07 -0700)]
Auto merge of #2988 - lifthrasiir:doc-open-with-target, r=alexcrichton

Make `cargo doc --open --target TARGET` work as expected.

Currently `cargo doc --open` opens `$TARGET/doc` unconditionally, but it is incorrect if the explicit target is specified.

The target directory should be same to what `Layout::new()` generates, and ideally it should use the same data source (it hadn't been so far), but I'm yet to find a good way to signal that. At least I'm pretty sure that `Compilation` is not a good position to put them (it assumes the bipartite "root"-"deps" separation which doesn't quite work in documentation).

9 years agoMake `cargo doc --open --target TARGET` work as expected.
Kang Seonghoon [Sat, 13 Aug 2016 21:30:02 +0000 (06:30 +0900)]
Make `cargo doc --open --target TARGET` work as expected.

9 years agoAuto merge of #2978 - matklad:opt-level, r=alexcrichton
bors [Tue, 9 Aug 2016 18:17:13 +0000 (11:17 -0700)]
Auto merge of #2978 - matklad:opt-level, r=alexcrichton

Gracefully handle errors in a lockfile

Closes #2715

Question: why internal errors are hidden by default? I think if the unexpected has happened you most likely want to know some details. See also #2756.

9 years agoAuto merge of #2979 - jonathandturner:prepare_for_new_format, r=alexcrichton
bors [Tue, 9 Aug 2016 16:25:54 +0000 (09:25 -0700)]
Auto merge of #2979 - jonathandturner:prepare_for_new_format, r=alexcrichton

Update cargo tests in prep for new errors

This updates a couple tests so that we can upgrade rustc to new error format.

r? @alexcrichton

9 years agoUpdate cargo tests in prep for new errors
Jonathan Turner [Tue, 9 Aug 2016 16:23:52 +0000 (09:23 -0700)]
Update cargo tests in prep for new errors

9 years agoDon't panic because of invalid source
Aleksey Kladov [Tue, 9 Aug 2016 13:11:20 +0000 (16:11 +0300)]
Don't panic because of invalid source

9 years agoGracefully handle duplicate package in a lockfile
Aleksey Kladov [Tue, 9 Aug 2016 12:14:26 +0000 (15:14 +0300)]
Gracefully handle duplicate package in a lockfile

9 years agoAuto merge of #2974 - alexcrichton:etag, r=brson
bors [Tue, 9 Aug 2016 02:10:55 +0000 (19:10 -0700)]
Auto merge of #2974 - alexcrichton:etag, r=brson

Speed up noop registry updates with GitHub

This commit adds supports to registry index updates to use GitHub's HTTP API [1]
which is purportedly [2] much faster than doing a git clone, and emprically that
appears to be the case.

This logic kicks in by looking at the URL of a registry's index, and if it looks
exactly like `github.com/$user/$repo` then we'll attempt to use GitHub's API,
otherwise we always fall back to a git update.

This behavior may *slow down* registry updates which actually need to download
information as an extra HTTP request is performed to figure out that we need to
perform a git fetch, but hopefully that won't actually be the case much of the
time!

[1]: https://developer.github.com/v3/repos/commits/#get-the-sha-1-of-a-commit-reference
[2]: https://developer.github.com/changes/2016-02-24-commit-reference-sha-api/

Closes https://github.com/rust-lang/cargo/issues/2451

9 years agoAuto merge of #2973 - alexcrichton:update-deps, r=alexcrichton
bors [Mon, 8 Aug 2016 18:14:09 +0000 (11:14 -0700)]
Auto merge of #2973 - alexcrichton:update-deps, r=alexcrichton

Update dependencies in Cargo.lock

A few bug fixes here and there we'll pick up (e.g. the gcc crate on newer MSVC
versions), but otherwise just staying on top of things.

9 years agoSpeed up noop registry updates with GitHub
Alex Crichton [Tue, 12 Jul 2016 16:36:33 +0000 (09:36 -0700)]
Speed up noop registry updates with GitHub

This commit adds supports to registry index updates to use GitHub's HTTP API [1]
which is purportedly [2] much faster than doing a git clone, and emprically that
appears to be the case.

This logic kicks in by looking at the URL of a registry's index, and if it looks
exactly like `github.com/$user/$repo` then we'll attempt to use GitHub's API,
otherwise we always fall back to a git update.

This behavior may *slow down* registry updates which actually need to download
information as an extra HTTP request is performed to figure out that we need to
perform a git fetch, but hopefully that won't actually be the case much of the
time!

[1]: https://developer.github.com/v3/repos/commits/#get-the-sha-1-of-a-commit-reference
[2]: https://developer.github.com/changes/2016-02-24-commit-reference-sha-api/

9 years agoUpdate dependencies in Cargo.lock
Alex Crichton [Sun, 7 Aug 2016 08:15:15 +0000 (01:15 -0700)]
Update dependencies in Cargo.lock

A few bug fixes here and there we'll pick up (e.g. the gcc crate on newer MSVC
versions), but otherwise just staying on top of things.

9 years agoAuto merge of #2871 - QuiltOS:doc-build-deps, r=alexcrichton
bors [Mon, 8 Aug 2016 17:37:17 +0000 (10:37 -0700)]
Auto merge of #2871 - QuiltOS:doc-build-deps, r=alexcrichton

Better rational for build-dependencies and other kinds being disjoint.

The old reason was bad because nothing prevents normal dependencies from
being built before the build script.

9 years agoAuto merge of #2954 - alexcrichton:panic-abort-plugins, r=brson
bors [Sun, 7 Aug 2016 06:35:42 +0000 (23:35 -0700)]
Auto merge of #2954 - alexcrichton:panic-abort-plugins, r=brson

Fix panic=abort when compiling with plugins

Closes #2738

9 years agoAuto merge of #2970 - jirutka:fix-musl-nfs, r=alexcrichton
bors [Sun, 7 Aug 2016 03:01:34 +0000 (20:01 -0700)]
Auto merge of #2970 - jirutka:fix-musl-nfs, r=alexcrichton

Disable is_on_nfs_mount() check on musl libc (fixes #2937)

musl libc doesn't provide constant NFS_SUPER_MAGICK that is used in the is_on_nfs_mount function.

9 years agoAuto merge of #2967 - frewsxcv:clippy, r=alexcrichton
bors [Sun, 7 Aug 2016 02:20:17 +0000 (19:20 -0700)]
Auto merge of #2967 - frewsxcv:clippy, r=alexcrichton

Address some clippy lints.

None

9 years agoAuto merge of #2971 - alexcrichton:openssl-init, r=alexcrichton
bors [Sun, 7 Aug 2016 01:13:13 +0000 (18:13 -0700)]
Auto merge of #2971 - alexcrichton:openssl-init, r=alexcrichton

Update OpenSSL-using dependencies

They've all been updated to canonicalize as `openssl_sys::init` as the "one true
method" for initializing OpenSSL,

Closes #2961